home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-10-28 | 8.0 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 100%
| file
| Emacs/XEmacs v19 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 100%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
|
|
hex view+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 32 3a 31 33 20 31 39 39 | 17 15:4|2:13 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 68 6f |.0/lisp/|ediff-ho|
|00000080| 6f 6b 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |ok.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n).. |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).| (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 68 6f 6f 6b 2e |or "`edi|ff-hook.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 09 42 11 c2 |byte-cod|e "..B..|
|000001f0| 09 42 11 c3 09 42 11 c0 | 87 22 20 5b 65 64 69 66 |.B...B..|." [edif|
|00000200| 66 2d 6d 65 6e 75 20 63 | 75 72 72 65 6e 74 2d 6c |f-menu c|urrent-l|
|00000210| 6f 61 64 2d 6c 69 73 74 | 20 65 64 69 66 66 2d 6d |oad-list| ediff-m|
|00000220| 65 72 67 65 2d 6d 65 6e | 75 20 65 70 61 74 63 68 |erge-men|u epatch|
|00000230| 2d 6d 65 6e 75 5d 20 32 | 29 0a 28 64 65 66 61 6c |-menu] 2|).(defal|
|00000240| 69 61 73 20 27 65 64 69 | 66 66 2d 78 65 6d 61 63 |ias 'edi|ff-xemac|
|00000250| 73 2d 69 6e 69 74 2d 6d | 65 6e 75 73 20 23 5b 6e |s-init-m|enus #[n|
|00000260| 69 6c 20 22 c0 c1 21 85 | 1f 00 c2 c3 5c 66 c5 23 |il "..!.|....\f.#|
|00000270| 88 c2 c6 0e 07 c5 23 88 | c2 c8 0e 09 c5 23 88 ca |......#.|.....#..|
|00000280| cb cc c5 23 87 22 20 5b | 66 65 61 74 75 72 65 70 |...#." [|featurep|
|00000290| 20 6d 65 6e 75 62 61 72 | 20 61 64 64 2d 73 75 62 | menubar| add-sub|
|000002a0| 6d 65 6e 75 20 28 22 54 | 6f 6f 6c 73 22 29 20 65 |menu ("T|ools") e|
|000002b0| 64 69 66 66 2d 6d 65 6e | 75 20 22 4f 4f 2d 42 72 |diff-men|u "OO-Br|
|000002c0| 6f 77 73 65 72 2e 2e 2e | 22 20 28 22 54 6f 6f 6c |owser...|" ("Tool|
|000002d0| 73 22 29 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |s") edif|f-merge-|
|000002e0| 6d 65 6e 75 20 28 22 54 | 6f 6f 6c 73 22 29 20 65 |menu ("T|ools") e|
|000002f0| 70 61 74 63 68 2d 6d 65 | 6e 75 20 61 64 64 2d 6d |patch-me|nu add-m|
|00000300| 65 6e 75 2d 62 75 74 74 | 6f 6e 20 28 22 54 6f 6f |enu-butt|on ("Too|
|00000310| 6c 73 22 29 20 5b 22 2d | 2d 2d 2d 2d 2d 2d 22 20 |ls") ["-|------" |
|00000320| 6e 69 6c 20 6e 69 6c 5d | 5d 20 34 5d 29 0a 28 62 |nil nil]|] 4]).(b|
|00000330| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 5c 6e 5c 22 |yte-code| "..\n\"|
|00000340| 83 43 00 c3 c4 21 84 0f | 00 c5 14 c4 0e 06 42 16 |.C...!..|......B.|
|00000350| 06 c3 c7 21 84 1e 00 c8 | 16 07 c7 0e 06 42 16 06 |...!....|.....B..|
|00000360| c3 c9 21 84 2d 00 ca 16 | 09 c9 0e 06 42 16 06 cb |..!.-...|....B...|
|00000370| cc cd 5c 22 88 0e 0e 84 | f5 01 cd 20 88 82 f5 01 |..\"....|... ....|
|00000380| cf d0 21 83 f5 01 c3 d1 | 21 84 54 00 d2 d3 21 16 |..!.....|!.T...!.|
|00000390| 11 d1 0e 06 42 16 06 d1 | 89 4a 4d 88 c3 d4 21 84 |....B...|.JM...!.|
|000003a0| 6a 00 d2 d5 21 16 14 d4 | 0e 06 42 16 06 d4 89 4a |j...!...|..B....J|
|000003b0| 4d 88 c3 d6 21 84 80 00 | d2 d7 21 16 16 d6 0e 06 |M...!...|..!.....|
|000003c0| 42 16 06 d6 89 4a 4d 88 | d8 0e 16 d9 da 23 88 d8 |B....JM.|.....#..|
|000003d0| 0e 16 db dc 23 88 d8 0e | 16 dd de 23 88 d8 0e 16 |....#...|...#....|
|000003e0| df e0 23 88 d8 0e 16 e1 | e2 23 88 d8 0e 16 e3 e4 |..#.....|.#......|
|000003f0| 23 88 d8 0e 16 e5 e6 23 | 88 d8 0e 16 e7 e8 23 88 |#......#|......#.|
|00000400| d8 0e 16 e9 ea 23 88 d8 | 0e 16 eb ec 23 88 d8 0e |.....#..|....#...|
|00000410| 16 ed ee 23 88 d8 0e 16 | ef f0 23 88 d8 0e 16 f1 |...#....|..#.....|
|00000420| f2 23 88 d8 0e 16 f3 f4 | 23 88 d8 0e 16 f5 f6 23 |.#......|#......#|
|00000430| 88 d8 0e 16 f7 f8 23 88 | d8 0e 16 f9 fa 23 88 d8 |......#.|.....#..|
|00000440| 0e 16 fb fc 23 88 d8 0e | 16 fd fe 23 88 d8 0e 16 |....#...|...#....|
|00000450| ff 81 40 00 23 88 d8 0e | 14 81 41 00 81 42 00 23 |..@.#...|..A..B.#|
|00000460| 88 d8 0e 14 81 43 00 81 | 44 00 23 88 d8 0e 14 81 |.....C..|D.#.....|
|00000470| 45 00 81 46 00 23 88 d8 | 0e 14 81 47 00 81 48 00 |E..F.#..|...G..H.|
|00000480| 23 88 d8 0e 14 81 49 00 | 81 4a 00 23 88 d8 0e 14 |#.....I.|.J.#....|
|00000490| 81 4b 00 81 4c 00 23 88 | d8 0e 14 81 4d 00 81 4e |.K..L.#.|....M..N|
|000004a0| 00 23 88 d8 0e 14 81 4f | 00 81 50 00 23 88 d8 0e |.#.....O|..P.#...|
|000004b0| 14 81 51 00 81 52 00 23 | 88 d8 0e 14 81 53 00 81 |..Q..R.#|.....S..|
|000004c0| 54 00 23 88 d8 0e 14 81 | 55 00 81 56 00 23 88 d8 |T.#.....|U..V.#..|
|000004d0| 0e 14 81 57 00 81 58 00 | 23 88 d8 0e 14 81 59 00 |...W..X.|#.....Y.|
|000004e0| 81 5a 00 23 88 d8 0e 14 | 81 5b 00 81 5c 5c 00 23 |.Z.#....|.[..\\.#|
|000004f0| 88 d8 0e 14 81 5d 00 81 | 5e 00 23 88 d8 0e 11 81 |.....]..|^.#.....|
|00000500| 5f 00 81 60 00 23 88 d8 | 0e 11 81 61 00 81 62 00 |_..`.#..|...a..b.|
|00000510| 23 88 d8 0e 11 81 63 00 | 81 64 00 23 88 d8 0e 11 |#.....c.|.d.#....|
|00000520| 81 65 00 81 66 00 23 88 | d8 0e 11 81 67 00 81 68 |.e..f.#.|....g..h|
|00000530| 00 23 88 0e 0e 84 b0 04 | 81 69 00 81 6a 00 81 6b |.#......|.i..j..k|
|00000540| 00 81 6c 00 81 6d 00 24 | 88 81 69 00 81 6e 00 81 |..l..m.$|..i..n..|
|00000550| 6b 00 81 6c 00 81 6d 00 | 24 88 81 69 00 81 6f 00 |k..l..m.|$..i..o.|
|00000560| 81 6b 00 81 70 00 81 6d | 00 24 88 81 69 00 81 71 |.k..p..m|.$..i..q|
|00000570| 00 81 6b 00 81 70 00 81 | 6d 00 24 88 81 69 00 81 |..k..p..|m.$..i..|
|00000580| 72 00 81 6b 00 81 73 00 | 81 6d 00 24 88 81 69 00 |r..k..s.|.m.$..i.|
|00000590| 81 74 00 81 6b 00 81 73 | 00 81 6d 00 24 88 81 69 |.t..k..s|..m.$..i|
|000005a0| 00 81 75 00 81 6b 00 81 | 76 00 81 6d 00 24 88 81 |..u..k..|v..m.$..|
|000005b0| 69 00 81 77 00 81 6b 00 | 81 76 00 81 6d 00 24 88 |i..w..k.|.v..m.$.|
|000005c0| 81 69 00 81 78 00 81 6b | 00 81 79 00 81 6d 00 24 |.i..x..k|..y..m.$|
|000005d0| 88 81 69 00 81 7a 00 81 | 6b 00 81 7b 00 81 6d 00 |..i..z..|k..{..m.|
|000005e0| 24 88 81 69 00 81 7c 00 | 81 6b 00 81 7d 00 81 6d |$..i..|.|.k..}..m|
|000005f0| 00 24 88 81 69 00 81 7e | 00 81 6b 00 81 7f 00 81 |.$..i..~|..k.....|
|00000600| 6d 00 24 88 81 69 00 81 | 80 00 81 6b 00 81 81 00 |m.$..i..|...k....|
|00000610| 81 6d 00 24 88 81 69 00 | 81 82 00 81 6b 00 81 83 |.m.$..i.|....k...|
|00000620| 00 81 6d 00 24 88 81 69 | 00 81 84 00 81 6b 00 81 |..m.$..i|.....k..|
|00000630| 83 00 81 6d 00 24 88 81 | 69 00 81 85 00 81 6b 00 |...m.$..|i.....k.|
|00000640| 81 86 00 23 88 81 69 00 | 81 87 00 81 6b 00 81 86 |...#..i.|....k...|
|00000650| 00 81 6d 00 24 88 81 69 | 00 81 88 00 81 6b 00 81 |..m.$..i|.....k..|
|00000660| 89 00 81 6d 00 24 88 81 | 69 00 81 8a 00 81 6b 00 |...m.$..|i.....k.|
|00000670| 81 89 00 81 6d 00 24 88 | 81 69 00 81 8b 00 81 6b |....m.$.|.i.....k|
|00000680| 00 81 8c 00 81 6d 00 24 | 88 81 69 00 81 8d 00 81 |.....m.$|..i.....|
|00000690| 6b 00 81 8e 00 81 6d 00 | 24 88 81 69 00 81 8f 00 |k.....m.|$..i....|
|000006a0| 81 6b 00 81 90 00 81 6d | 00 24 88 81 69 00 81 91 |.k.....m|.$..i...|
|000006b0| 00 81 6b 00 81 92 00 81 | 6d 00 24 88 81 69 00 81 |..k.....|m.$..i..|
|000006c0| 93 00 81 6b 00 81 92 00 | 81 6d 00 24 88 81 69 00 |...k....|.m.$..i.|
|000006d0| 81 94 00 81 6b 00 81 95 | 00 81 6d 00 24 88 81 69 |....k...|..m.$..i|
|000006e0| 00 81 96 00 81 6b 00 81 | 95 00 81 6d 00 24 88 81 |.....k..|...m.$..|
|000006f0| 69 00 81 97 00 81 6b 00 | 81 98 00 81 6d 00 24 88 |i.....k.|....m.$.|
|00000700| 81 69 00 81 99 00 81 6b | 00 81 98 00 81 6d 00 24 |.i.....k|.....m.$|
|00000710| 88 81 69 00 81 9a 00 81 | 6b 00 81 9b 00 81 6d 00 |..i.....|k.....m.|
|00000720| 24 88 81 69 00 81 9c 00 | 81 6b 00 81 9b 00 81 6d |$..i....|.k.....m|
|00000730| 00 24 88 81 69 00 81 9d | 00 81 6b 00 81 9e 00 81 |.$..i...|..k.....|
|00000740| 6d 00 24 88 81 69 00 81 | 9f 00 81 6b 00 81 9e 00 |m.$..i..|...k....|
|00000750| 81 6d 00 24 88 81 69 00 | 81 a0 00 81 6b 00 81 a1 |.m.$..i.|....k...|
|00000760| 00 81 6d 00 24 88 81 69 | 00 81 a2 00 81 6b 00 81 |..m.$..i|.....k..|
|00000770| a1 00 81 6d 00 24 88 81 | 69 00 81 a3 00 81 6b 00 |...m.$..|i.....k.|
|00000780| 81 a4 00 81 6d 00 24 88 | 81 69 00 81 a5 00 81 6b |....m.$.|.i.....k|
|00000790| 00 81 a4 00 81 6d 00 24 | 88 81 69 00 81 a6 00 81 |.....m.$|..i.....|
|000007a0| 6b 00 81 a7 00 81 6d 00 | 24 88 81 69 00 81 a8 00 |k.....m.|$..i....|
|000007b0| 81 6b 00 81 a7 00 81 6d | 00 24 88 81 69 00 81 a9 |.k.....m|.$..i...|
|000007c0| 00 81 aa 00 81 ab 00 81 | 6d 00 24 88 81 69 00 81 |........|m.$..i..|
|000007d0| ac 00 81 6b 00 81 ad 00 | 81 6d 00 24 88 81 69 00 |...k....|.m.$..i.|
|000007e0| 81 ae 00 81 6b 00 81 af | 00 81 6d 00 24 88 81 b0 |....k...|..m.$...|
|000007f0| 00 81 b1 00 21 87 22 20 | 5b 73 74 72 69 6e 67 2d |....!." |[string-|
|00000800| 6d 61 74 63 68 20 22 58 | 45 6d 61 63 73 22 20 65 |match "X|Emacs" e|
|00000810| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 62 6f 75 |macs-ver|sion bou|
|00000820| 6e 64 70 20 65 64 69 66 | 66 2d 6d 65 6e 75 20 28 |ndp edif|f-menu (|
|00000830| 22 43 6f 6d 70 61 72 65 | 22 20 5b 22 54 77 6f 20 |"Compare|" ["Two |
|00000840| 46 69 6c 65 73 2e 2e 2e | 22 20 65 64 69 66 66 2d |Files...|" ediff-|
|00000850| 66 69 6c 65 73 20 74 5d | 20 5b 22 54 77 6f 20 42 |files t]| ["Two B|
|00000860| 75 66 66 65 72 73 2e 2e | 2e 22 20 65 64 69 66 66 |uffers..|." ediff|
|00000870| 2d 62 75 66 66 65 72 73 | 20 74 5d 20 5b 22 54 68 |-buffers| t] ["Th|
|00000880| 72 65 65 20 46 69 6c 65 | 73 2e 2e 2e 22 20 65 64 |ree File|s..." ed|
|00000890| 69 66 66 2d 66 69 6c 65 | 73 33 20 74 5d 20 5b 22 |iff-file|s3 t] ["|
|000008a0| 54 68 72 65 65 20 42 75 | 66 66 65 72 73 2e 2e 2e |Three Bu|ffers...|
|000008b0| 22 20 65 64 69 66 66 2d | 62 75 66 66 65 72 73 33 |" ediff-|buffers3|
|000008c0| 20 74 5d 20 22 2d 2d 2d | 22 20 5b 22 54 77 6f 20 | t] "---|" ["Two |
|000008d0| 44 69 72 65 63 74 6f 72 | 69 65 73 2e 2e 2e 22 20 |Director|ies..." |
|000008e0| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 69 65 |ediff-di|rectorie|
|000008f0| 73 20 74 5d 20 5b 22 54 | 68 72 65 65 20 44 69 72 |s t] ["T|hree Dir|
|00000900| 65 63 74 6f 72 69 65 73 | 2e 2e 2e 22 20 65 64 69 |ectories|..." edi|
|00000910| 66 66 2d 64 69 72 65 63 | 74 6f 72 69 65 73 33 20 |ff-direc|tories3 |
|00000920| 74 5d 20 22 2d 2d 2d 22 | 20 5b 22 46 69 6c 65 20 |t] "---"| ["File |
|00000930| 77 69 74 68 20 52 65 76 | 69 73 69 6f 6e 2e 2e 2e |with Rev|ision...|
|00000940| 22 20 65 64 69 66 66 2d | 72 65 76 69 73 69 6f 6e |" ediff-|revision|
|00000950| 20 74 5d 20 5b 22 44 69 | 72 65 63 74 6f 72 79 20 | t] ["Di|rectory |
|00000960| 52 65 76 69 73 69 6f 6e | 73 2e 2e 2e 22 20 65 64 |Revision|s..." ed|
|00000970| 69 66 66 2d 64 69 72 65 | 63 74 6f 72 79 2d 72 65 |iff-dire|ctory-re|
|00000980| 76 69 73 69 6f 6e 73 20 | 74 5d 20 22 2d 2d 2d 22 |visions |t] "---"|
|00000990| 20 5b 22 57 69 6e 64 6f | 77 73 20 57 6f 72 64 2d | ["Windo|ws Word-|
|000009a0| 62 79 2d 77 6f 72 64 2e | 2e 2e 22 20 65 64 69 66 |by-word.|.." edif|
|000009b0| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|000009c0| 73 65 20 74 5d 20 5b 22 | 57 69 6e 64 6f 77 73 20 |se t] ["|Windows |
|000009d0| 4c 69 6e 65 2d 62 79 2d | 6c 69 6e 65 2e 2e 2e 22 |Line-by-|line..."|
|000009e0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 6c | ediff-w|indows-l|
|000009f0| 69 6e 65 77 69 73 65 20 | 74 5d 20 22 2d 2d 2d 22 |inewise |t] "---"|
|00000a00| 20 5b 22 52 65 67 69 6f | 6e 73 20 57 6f 72 64 2d | ["Regio|ns Word-|
|00000a10| 62 79 2d 77 6f 72 64 2e | 2e 2e 22 20 65 64 69 66 |by-word.|.." edif|
|00000a20| 66 2d 72 65 67 69 6f 6e | 73 2d 77 6f 72 64 77 69 |f-region|s-wordwi|
|00000a30| 73 65 20 74 5d 20 5b 22 | 52 65 67 69 6f 6e 73 20 |se t] ["|Regions |
|00000a40| 4c 69 6e 65 2d 62 79 2d | 6c 69 6e 65 2e 2e 2e 22 |Line-by-|line..."|
|00000a50| 20 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 6c | ediff-r|egions-l|
|00000a60| 69 6e 65 77 69 73 65 20 | 74 5d 20 22 2d 2d 2d 22 |inewise |t] "---"|
|00000a70| 20 5b 22 4c 69 73 74 20 | 45 64 69 66 66 20 53 65 | ["List |Ediff Se|
|00000a80| 73 73 69 6f 6e 73 2e 2e | 2e 22 20 65 64 69 66 66 |ssions..|." ediff|
|00000a90| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 20 74 |-show-re|gistry t|
|00000aa0| 5d 20 5b 22 45 64 69 66 | 66 20 4d 61 6e 75 61 6c |] ["Edif|f Manual|
|00000ab0| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 64 6f 63 75 6d |..." edi|ff-docum|
|00000ac0| 65 6e 74 61 74 69 6f 6e | 20 74 5d 29 20 63 75 72 |entation| t]) cur|
|00000ad0| 72 65 6e 74 2d 6c 6f 61 | 64 2d 6c 69 73 74 20 65 |rent-loa|d-list e|
|00000ae0| 64 69 66 66 2d 6d 65 72 | 67 65 2d 6d 65 6e 75 20 |diff-mer|ge-menu |
|00000af0| 28 22 4d 65 72 67 65 22 | 20 5b 22 46 69 6c 65 73 |("Merge"| ["Files|
|00000b00| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |..." edi|ff-merge|
|00000b10| 2d 66 69 6c 65 73 20 74 | 5d 20 5b 22 46 69 6c 65 |-files t|] ["File|
|00000b20| 73 20 77 69 74 68 20 41 | 6e 63 65 73 74 6f 72 2e |s with A|ncestor.|
|00000b30| 2e 2e 22 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |.." edif|f-merge-|
|00000b40| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00000b50| 74 6f 72 20 74 5d 20 5b | 22 42 75 66 66 65 72 73 |tor t] [|"Buffers|
|00000b60| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |..." edi|ff-merge|
|00000b70| 2d 62 75 66 66 65 72 73 | 20 74 5d 20 5b 22 42 75 |-buffers| t] ["Bu|
|00000b80| 66 66 65 72 73 20 77 69 | 74 68 20 41 6e 63 65 73 |ffers wi|th Ances|
|00000b90| 74 6f 72 2e 2e 2e 22 20 | 65 64 69 66 66 2d 6d 65 |tor..." |ediff-me|
|00000ba0| 72 67 65 2d 62 75 66 66 | 65 72 73 2d 77 69 74 68 |rge-buff|ers-with|
|00000bb0| 2d 61 6e 63 65 73 74 6f | 72 20 74 5d 20 22 2d 2d |-ancesto|r t] "--|
|00000bc0| 2d 22 20 5b 22 44 69 72 | 65 63 74 6f 72 69 65 73 |-" ["Dir|ectories|
|00000bd0| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |..." edi|ff-merge|
|00000be0| 2d 64 69 72 65 63 74 6f | 72 69 65 73 20 74 5d 20 |-directo|ries t] |
|00000bf0| 5b 22 44 69 72 65 63 74 | 6f 72 69 65 73 20 77 69 |["Direct|ories wi|
|00000c00| 74 68 20 41 6e 63 65 73 | 74 6f 72 2e 2e 2e 22 20 |th Ances|tor..." |
|00000c10| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|00000c20| 63 74 6f 72 69 65 73 2d | 77 69 74 68 2d 61 6e 63 |ctories-|with-anc|
|00000c30| 65 73 74 6f 72 20 74 5d | 20 22 2d 2d 2d 22 20 5b |estor t]| "---" [|
|00000c40| 22 52 65 76 69 73 69 6f | 6e 73 2e 2e 2e 22 20 65 |"Revisio|ns..." e|
|00000c50| 64 69 66 66 2d 6d 65 72 | 67 65 2d 72 65 76 69 73 |diff-mer|ge-revis|
|00000c60| 69 6f 6e 73 20 74 5d 20 | 5b 22 52 65 76 69 73 69 |ions t] |["Revisi|
|00000c70| 6f 6e 73 20 77 69 74 68 | 20 41 6e 63 65 73 74 6f |ons with| Ancesto|
|00000c80| 72 2e 2e 2e 22 20 65 64 | 69 66 66 2d 6d 65 72 67 |r..." ed|iff-merg|
|00000c90| 65 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |e-revisi|ons-with|
|00000ca0| 2d 61 6e 63 65 73 74 6f | 72 20 74 5d 20 5b 22 44 |-ancesto|r t] ["D|
|00000cb0| 69 72 65 63 74 6f 72 79 | 20 52 65 76 69 73 69 6f |irectory| Revisio|
|00000cc0| 6e 73 2e 2e 2e 22 20 65 | 64 69 66 66 2d 6d 65 72 |ns..." e|diff-mer|
|00000cd0| 67 65 2d 64 69 72 65 63 | 74 6f 72 79 2d 72 65 76 |ge-direc|tory-rev|
|00000ce0| 69 73 69 6f 6e 73 20 74 | 5d 20 5b 22 44 69 72 65 |isions t|] ["Dire|
|00000cf0| 63 74 6f 72 79 20 52 65 | 76 69 73 69 6f 6e 73 20 |ctory Re|visions |
|00000d00| 77 69 74 68 20 41 6e 63 | 65 73 74 6f 72 2e 2e 2e |with Anc|estor...|
|00000d10| 22 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |" ediff-|merge-di|
|00000d20| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|00000d30| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00000d40| 74 5d 20 22 2d 2d 2d 22 | 20 5b 22 4c 69 73 74 20 |t] "---"| ["List |
|00000d50| 45 64 69 66 66 20 53 65 | 73 73 69 6f 6e 73 2e 2e |Ediff Se|ssions..|
|00000d60| 2e 22 20 65 64 69 66 66 | 2d 73 68 6f 77 2d 72 65 |." ediff|-show-re|
|00000d70| 67 69 73 74 72 79 20 74 | 5d 20 5b 22 45 64 69 66 |gistry t|] ["Edif|
|00000d80| 66 20 4d 61 6e 75 61 6c | 2e 2e 2e 22 20 65 64 69 |f Manual|..." edi|
|00000d90| 66 66 2d 64 6f 63 75 6d | 65 6e 74 61 74 69 6f 6e |ff-docum|entation|
|00000da0| 20 74 5d 29 20 65 70 61 | 74 63 68 2d 6d 65 6e 75 | t]) epa|tch-menu|
|00000db0| 20 28 22 41 70 70 6c 79 | 20 50 61 74 63 68 22 20 | ("Apply| Patch" |
|00000dc0| 5b 22 54 6f 20 61 20 66 | 69 6c 65 2e 2e 2e 22 20 |["To a f|ile..." |
|00000dd0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 66 69 6c 65 |ediff-pa|tch-file|
|00000de0| 20 74 5d 20 5b 22 54 6f | 20 61 20 62 75 66 66 65 | t] ["To| a buffe|
|00000df0| 72 2e 2e 2e 22 20 65 64 | 69 66 66 2d 70 61 74 63 |r..." ed|iff-patc|
|00000e00| 68 2d 62 75 66 66 65 72 | 20 74 5d 20 22 2d 2d 2d |h-buffer| t] "---|
|00000e10| 22 20 5b 22 4c 69 73 74 | 20 45 64 69 66 66 20 53 |" ["List| Ediff S|
|00000e20| 65 73 73 69 6f 6e 73 2e | 2e 2e 22 20 65 64 69 66 |essions.|.." edif|
|00000e30| 66 2d 73 68 6f 77 2d 72 | 65 67 69 73 74 72 79 20 |f-show-r|egistry |
|00000e40| 74 5d 20 5b 22 45 64 69 | 66 66 20 4d 61 6e 75 61 |t] ["Edi|ff Manua|
|00000e50| 6c 2e 2e 2e 22 20 65 64 | 69 66 66 2d 64 6f 63 75 |l..." ed|iff-docu|
|00000e60| 6d 65 6e 74 61 74 69 6f | 6e 20 74 5d 29 20 61 64 |mentatio|n t]) ad|
|00000e70| 64 2d 68 6f 6f 6b 20 62 | 65 66 6f 72 65 2d 69 6e |d-hook b|efore-in|
|00000e80| 69 74 2d 68 6f 6f 6b 20 | 65 64 69 66 66 2d 78 65 |it-hook |ediff-xe|
|00000e90| 6d 61 63 73 2d 69 6e 69 | 74 2d 6d 65 6e 75 73 20 |macs-ini|t-menus |
|00000ea0| 70 75 72 69 66 79 2d 66 | 6c 61 67 20 66 65 61 74 |purify-f|lag feat|
|00000eb0| 75 72 65 70 20 6d 65 6e | 75 2d 62 61 72 20 6d 65 |urep men|u-bar me|
|00000ec0| 6e 75 2d 62 61 72 2d 65 | 70 61 74 63 68 2d 6d 65 |nu-bar-e|patch-me|
|00000ed0| 6e 75 20 6d 61 6b 65 2d | 73 70 61 72 73 65 2d 6b |nu make-|sparse-k|
|00000ee0| 65 79 6d 61 70 20 22 41 | 70 70 6c 79 20 50 61 74 |eymap "A|pply Pat|
|00000ef0| 63 68 22 20 6d 65 6e 75 | 2d 62 61 72 2d 65 64 69 |ch" menu|-bar-edi|
|00000f00| 66 66 2d 6d 65 72 67 65 | 2d 6d 65 6e 75 20 22 4d |ff-merge|-menu "M|
|00000f10| 65 72 67 65 22 20 6d 65 | 6e 75 2d 62 61 72 2d 65 |erge" me|nu-bar-e|
|00000f20| 64 69 66 66 2d 6d 65 6e | 75 20 22 43 6f 6d 70 61 |diff-men|u "Compa|
|00000f30| 72 65 22 20 64 65 66 69 | 6e 65 2d 6b 65 79 20 5b |re" defi|ne-key [|
|00000f40| 65 64 69 66 66 2d 64 6f | 63 5d 20 28 22 45 64 69 |ediff-do|c] ("Edi|
|00000f50| 66 66 20 4d 61 6e 75 61 | 6c 2e 2e 2e 22 20 2e 20 |ff Manua|l..." . |
|00000f60| 65 64 69 66 66 2d 64 6f | 63 75 6d 65 6e 74 61 74 |ediff-do|cumentat|
|00000f70| 69 6f 6e 29 20 5b 65 72 | 65 67 69 73 74 72 79 5d |ion) [er|egistry]|
|00000f80| 20 28 22 4c 69 73 74 20 | 45 64 69 66 66 20 53 65 | ("List |Ediff Se|
|00000f90| 73 73 69 6f 6e 73 2e 2e | 2e 22 20 2e 20 65 64 69 |ssions..|." . edi|
|00000fa0| 66 66 2d 73 68 6f 77 2d | 72 65 67 69 73 74 72 79 |ff-show-|registry|
|00000fb0| 29 20 5b 73 65 70 61 72 | 61 74 6f 72 2d 65 64 69 |) [separ|ator-edi|
|00000fc0| 66 66 2d 6d 61 6e 75 61 | 6c 5d 20 28 22 2d 2d 22 |ff-manua|l] ("--"|
|00000fd0| 29 20 5b 77 69 6e 64 6f | 77 5d 20 28 22 54 68 69 |) [windo|w] ("Thi|
|00000fe0| 73 20 57 69 6e 64 6f 77 | 20 61 6e 64 20 4e 65 78 |s Window| and Nex|
|00000ff0| 74 20 57 69 6e 64 6f 77 | 22 20 2e 20 63 6f 6d 70 |t Window|" . comp|
|00001000| 61 72 65 2d 77 69 6e 64 | 6f 77 73 29 20 5b 65 64 |are-wind|ows) [ed|
|00001010| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 6c 69 6e 65 |iff-wind|ows-line|
|00001020| 77 69 73 65 5d 20 28 22 | 57 69 6e 64 6f 77 73 20 |wise] ("|Windows |
|00001030| 4c 69 6e 65 2d 62 79 2d | 6c 69 6e 65 2e 2e 2e 22 |Line-by-|line..."|
|00001040| 20 2e 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 | . ediff|-windows|
|00001050| 2d 6c 69 6e 65 77 69 73 | 65 29 20 5b 65 64 69 66 |-linewis|e) [edif|
|00001060| 66 2d 77 69 6e 64 6f 77 | 73 2d 77 6f 72 64 77 69 |f-window|s-wordwi|
|00001070| 73 65 5d 20 28 22 57 69 | 6e 64 6f 77 73 20 57 6f |se] ("Wi|ndows Wo|
|00001080| 72 64 2d 62 79 2d 77 6f | 72 64 2e 2e 2e 22 20 2e |rd-by-wo|rd..." .|
|00001090| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 77 | ediff-w|indows-w|
|000010a0| 6f 72 64 77 69 73 65 29 | 20 5b 73 65 70 61 72 61 |ordwise)| [separa|
|000010b0| 74 6f 72 2d 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |tor-edif|f-window|
|000010c0| 73 5d 20 28 22 2d 2d 22 | 29 20 5b 65 64 69 66 66 |s] ("--"|) [ediff|
|000010d0| 2d 72 65 67 69 6f 6e 73 | 2d 6c 69 6e 65 77 69 73 |-regions|-linewis|
|000010e0| 65 5d 20 28 22 52 65 67 | 69 6f 6e 73 20 4c 69 6e |e] ("Reg|ions Lin|
|000010f0| 65 2d 62 79 2d 6c 69 6e | 65 2e 2e 2e 22 20 2e 20 |e-by-lin|e..." . |
|00001100| 65 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 2d 6c 69 |ediff-re|gions-li|
|00001110| 6e 65 77 69 73 65 29 20 | 5b 65 64 69 66 66 2d 72 |newise) |[ediff-r|
|00001120| 65 67 69 6f 6e 73 2d 77 | 6f 72 64 77 69 73 65 5d |egions-w|ordwise]|
|00001130| 20 28 22 52 65 67 69 6f | 6e 73 20 57 6f 72 64 2d | ("Regio|ns Word-|
|00001140| 62 79 2d 77 6f 72 64 2e | 2e 2e 22 20 2e 20 65 64 |by-word.|.." . ed|
|00001150| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 77 6f 72 64 |iff-regi|ons-word|
|00001160| 77 69 73 65 29 20 5b 73 | 65 70 61 72 61 74 6f 72 |wise) [s|eparator|
|00001170| 2d 65 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 5d 20 |-ediff-r|egions] |
|00001180| 28 22 2d 2d 22 29 20 5b | 65 64 69 66 66 2d 64 69 |("--") [|ediff-di|
|00001190| 72 2d 72 65 76 69 73 69 | 6f 6e 5d 20 28 22 44 69 |r-revisi|on] ("Di|
|000011a0| 72 65 63 74 6f 72 79 20 | 52 65 76 69 73 69 6f 6e |rectory |Revision|
|000011b0| 73 2e 2e 2e 22 20 2e 20 | 65 64 69 66 66 2d 64 69 |s..." . |ediff-di|
|000011c0| 72 65 63 74 6f 72 79 2d | 72 65 76 69 73 69 6f 6e |rectory-|revision|
|000011d0| 73 29 20 5b 65 64 69 66 | 66 2d 72 65 76 69 73 69 |s) [edif|f-revisi|
|000011e0| 6f 6e 5d 20 28 22 46 69 | 6c 65 20 77 69 74 68 20 |on] ("Fi|le with |
|000011f0| 52 65 76 69 73 69 6f 6e | 2e 2e 2e 22 20 2e 20 65 |Revision|..." . e|
|00001200| 64 69 66 66 2d 72 65 76 | 69 73 69 6f 6e 29 20 5b |diff-rev|ision) [|
|00001210| 73 65 70 61 72 61 74 6f | 72 2d 65 64 69 66 66 2d |separato|r-ediff-|
|00001220| 64 69 72 65 63 74 6f 72 | 69 65 73 5d 20 28 22 2d |director|ies] ("-|
|00001230| 2d 22 29 20 5b 65 64 69 | 66 66 2d 64 69 72 65 63 |-") [edi|ff-direc|
|00001240| 74 6f 72 69 65 73 33 5d | 20 28 22 54 68 72 65 65 |tories3]| ("Three|
|00001250| 20 44 69 72 65 63 74 6f | 72 69 65 73 2e 2e 2e 22 | Directo|ries..."|
|00001260| 20 2e 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f | . ediff|-directo|
|00001270| 72 69 65 73 33 29 20 5b | 65 64 69 66 66 2d 64 69 |ries3) [|ediff-di|
|00001280| 72 65 63 74 6f 72 69 65 | 73 5d 20 28 22 54 77 6f |rectorie|s] ("Two|
|00001290| 20 44 69 72 65 63 74 6f | 72 69 65 73 2e 2e 2e 22 | Directo|ries..."|
|000012a0| 20 2e 20 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f | . ediff|-directo|
|000012b0| 72 69 65 73 29 20 5b 73 | 65 70 61 72 61 74 6f 72 |ries) [s|eparator|
|000012c0| 2d 65 64 69 66 66 2d 66 | 69 6c 65 73 5d 20 28 22 |-ediff-f|iles] ("|
|000012d0| 2d 2d 22 29 20 5b 65 64 | 69 66 66 2d 62 75 66 66 |--") [ed|iff-buff|
|000012e0| 65 72 73 33 5d 20 28 22 | 54 68 72 65 65 20 42 75 |ers3] ("|Three Bu|
|000012f0| 66 66 65 72 73 2e 2e 2e | 22 20 2e 20 65 64 69 66 |ffers...|" . edif|
|00001300| 66 2d 62 75 66 66 65 72 | 73 33 29 20 5b 65 64 69 |f-buffer|s3) [edi|
|00001310| 66 66 2d 66 69 6c 65 73 | 33 5d 20 28 22 54 68 72 |ff-files|3] ("Thr|
|00001320| 65 65 20 46 69 6c 65 73 | 2e 2e 2e 22 20 2e 20 65 |ee Files|..." . e|
|00001330| 64 69 66 66 2d 66 69 6c | 65 73 33 29 20 5b 65 64 |diff-fil|es3) [ed|
|00001340| 69 66 66 2d 62 75 66 66 | 65 72 73 5d 20 28 22 54 |iff-buff|ers] ("T|
|00001350| 77 6f 20 42 75 66 66 65 | 72 73 2e 2e 2e 22 20 2e |wo Buffe|rs..." .|
|00001360| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 29 20 | ediff-b|uffers) |
|00001370| 5b 65 64 69 66 66 2d 66 | 69 6c 65 73 5d 20 28 22 |[ediff-f|iles] ("|
|00001380| 54 77 6f 20 46 69 6c 65 | 73 2e 2e 2e 22 20 2e 20 |Two File|s..." . |
|00001390| 65 64 69 66 66 2d 66 69 | 6c 65 73 29 20 5b 65 64 |ediff-fi|les) [ed|
|000013a0| 69 66 66 2d 64 6f 63 32 | 5d 20 28 22 45 64 69 66 |iff-doc2|] ("Edif|
|000013b0| 66 20 4d 61 6e 75 61 6c | 2e 2e 2e 22 20 2e 20 65 |f Manual|..." . e|
|000013c0| 64 69 66 66 2d 64 6f 63 | 75 6d 65 6e 74 61 74 69 |diff-doc|umentati|
|000013d0| 6f 6e 29 20 5b 65 72 65 | 67 69 73 74 72 79 32 5d |on) [ere|gistry2]|
|000013e0| 20 28 22 4c 69 73 74 20 | 45 64 69 66 66 20 53 65 | ("List |Ediff Se|
|000013f0| 73 73 69 6f 6e 73 2e 2e | 2e 22 20 2e 20 65 64 69 |ssions..|." . edi|
|00001400| 66 66 2d 73 68 6f 77 2d | 72 65 67 69 73 74 72 79 |ff-show-|registry|
|00001410| 29 20 5b 73 65 70 61 72 | 61 74 6f 72 2d 65 64 69 |) [separ|ator-edi|
|00001420| 66 66 2d 6d 65 72 67 65 | 2d 6d 61 6e 75 61 6c 5d |ff-merge|-manual]|
|00001430| 20 28 22 2d 2d 22 29 20 | 5b 65 64 69 66 66 2d 6d | ("--") |[ediff-m|
|00001440| 65 72 67 65 2d 64 69 72 | 2d 72 65 76 69 73 69 6f |erge-dir|-revisio|
|00001450| 6e 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ns-with-|ancestor|
|00001460| 5d 20 28 22 44 69 72 65 | 63 74 6f 72 79 20 52 65 |] ("Dire|ctory Re|
|00001470| 76 69 73 69 6f 6e 73 20 | 77 69 74 68 20 41 6e 63 |visions |with Anc|
|00001480| 65 73 74 6f 72 2e 2e 2e | 22 20 2e 20 65 64 69 66 |estor...|" . edif|
|00001490| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|000014a0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|000014b0| 2d 61 6e 63 65 73 74 6f | 72 29 20 5b 65 64 69 66 |-ancesto|r) [edif|
|000014c0| 66 2d 6d 65 72 67 65 2d | 64 69 72 2d 72 65 76 69 |f-merge-|dir-revi|
|000014d0| 73 69 6f 6e 73 5d 20 28 | 22 44 69 72 65 63 74 6f |sions] (|"Directo|
|000014e0| 72 79 20 52 65 76 69 73 | 69 6f 6e 73 2e 2e 2e 22 |ry Revis|ions..."|
|000014f0| 20 2e 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 64 | . ediff|-merge-d|
|00001500| 69 72 65 63 74 6f 72 79 | 2d 72 65 76 69 73 69 6f |irectory|-revisio|
|00001510| 6e 73 29 20 5b 65 64 69 | 66 66 2d 6d 65 72 67 65 |ns) [edi|ff-merge|
|00001520| 2d 72 65 76 69 73 69 6f | 6e 73 2d 77 69 74 68 2d |-revisio|ns-with-|
|00001530| 61 6e 63 65 73 74 6f 72 | 5d 20 28 22 52 65 76 69 |ancestor|] ("Revi|
|00001540| 73 69 6f 6e 73 20 77 69 | 74 68 20 41 6e 63 65 73 |sions wi|th Ances|
|00001550| 74 6f 72 2e 2e 2e 22 20 | 2e 20 65 64 69 66 66 2d |tor..." |. ediff-|
|00001560| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 2d |merge-re|visions-|
|00001570| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 29 20 5b |with-anc|estor) [|
|00001580| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 72 65 76 69 |ediff-me|rge-revi|
|00001590| 73 69 6f 6e 73 5d 20 28 | 22 52 65 76 69 73 69 6f |sions] (|"Revisio|
|000015a0| 6e 73 2e 2e 2e 22 20 2e | 20 65 64 69 66 66 2d 6d |ns..." .| ediff-m|
|000015b0| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 29 20 |erge-rev|isions) |
|000015c0| 5b 73 65 70 61 72 61 74 | 6f 72 2d 65 64 69 66 66 |[separat|or-ediff|
|000015d0| 2d 6d 65 72 67 65 5d 20 | 28 22 2d 2d 22 29 20 5b |-merge] |("--") [|
|000015e0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 64 69 72 65 |ediff-me|rge-dire|
|000015f0| 63 74 6f 72 69 65 73 2d | 77 69 74 68 2d 61 6e 63 |ctories-|with-anc|
|00001600| 65 73 74 6f 72 5d 20 28 | 22 44 69 72 65 63 74 6f |estor] (|"Directo|
|00001610| 72 69 65 73 20 77 69 74 | 68 20 41 6e 63 65 73 74 |ries wit|h Ancest|
|00001620| 6f 72 2e 2e 2e 22 20 2e | 20 65 64 69 66 66 2d 6d |or..." .| ediff-m|
|00001630| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00001640| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00001650| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 64 69 72 |[ediff-m|erge-dir|
|00001660| 65 63 74 6f 72 69 65 73 | 5d 20 28 22 44 69 72 65 |ectories|] ("Dire|
|00001670| 63 74 6f 72 69 65 73 2e | 2e 2e 22 20 2e 20 65 64 |ctories.|.." . ed|
|00001680| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00001690| 6f 72 69 65 73 29 20 5b | 73 65 70 61 72 61 74 6f |ories) [|separato|
|000016a0| 72 2d 65 64 69 66 66 2d | 6d 65 72 67 65 2d 64 69 |r-ediff-|merge-di|
|000016b0| 72 73 5d 20 28 22 2d 2d | 22 29 20 5b 65 64 69 66 |rs] ("--|") [edif|
|000016c0| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|000016d0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 5d 20 28 |with-anc|estor] (|
|000016e0| 22 42 75 66 66 65 72 73 | 20 77 69 74 68 20 41 6e |"Buffers| with An|
|000016f0| 63 65 73 74 6f 72 2e 2e | 2e 22 20 2e 20 65 64 69 |cestor..|." . edi|
|00001700| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00001710| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 29 20 |-with-an|cestor) |
|00001720| 5b 65 64 69 66 66 2d 6d | 65 72 67 65 2d 62 75 66 |[ediff-m|erge-buf|
|00001730| 66 65 72 73 5d 20 28 22 | 42 75 66 66 65 72 73 2e |fers] ("|Buffers.|
|00001740| 2e 2e 22 20 2e 20 65 64 | 69 66 66 2d 6d 65 72 67 |.." . ed|iff-merg|
|00001750| 65 2d 62 75 66 66 65 72 | 73 29 20 5b 65 64 69 66 |e-buffer|s) [edif|
|00001760| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |f-merge-|files-wi|
|00001770| 74 68 2d 61 6e 63 65 73 | 74 6f 72 5d 20 28 22 46 |th-ances|tor] ("F|
|00001780| 69 6c 65 73 20 77 69 74 | 68 20 41 6e 63 65 73 74 |iles wit|h Ancest|
|00001790| 6f 72 2e 2e 2e 22 20 2e | 20 65 64 69 66 66 2d 6d |or..." .| ediff-m|
|000017a0| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|000017b0| 61 6e 63 65 73 74 6f 72 | 29 20 5b 65 64 69 66 66 |ancestor|) [ediff|
|000017c0| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 73 5d 20 28 22 |-merge-f|iles] ("|
|000017d0| 46 69 6c 65 73 2e 2e 2e | 22 20 2e 20 65 64 69 66 |Files...|" . edif|
|000017e0| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 29 20 5b |f-merge-|files) [|
|000017f0| 65 64 69 66 66 2d 64 6f | 63 33 5d 20 28 22 45 64 |ediff-do|c3] ("Ed|
|00001800| 69 66 66 20 4d 61 6e 75 | 61 6c 2e 2e 2e 22 20 2e |iff Manu|al..." .|
|00001810| 20 65 64 69 66 66 2d 64 | 6f 63 75 6d 65 6e 74 61 | ediff-d|ocumenta|
|00001820| 74 69 6f 6e 29 20 5b 65 | 72 65 67 69 73 74 72 79 |tion) [e|registry|
|00001830| 33 5d 20 28 22 4c 69 73 | 74 20 45 64 69 66 66 20 |3] ("Lis|t Ediff |
|00001840| 53 65 73 73 69 6f 6e 73 | 2e 2e 2e 22 20 2e 20 65 |Sessions|..." . e|
|00001850| 64 69 66 66 2d 73 68 6f | 77 2d 72 65 67 69 73 74 |diff-sho|w-regist|
|00001860| 72 79 29 20 5b 73 65 70 | 61 72 61 74 6f 72 2d 65 |ry) [sep|arator-e|
|00001870| 70 61 74 63 68 5d 20 28 | 22 2d 2d 22 29 20 5b 65 |patch] (|"--") [e|
|00001880| 64 69 66 66 2d 70 61 74 | 63 68 2d 62 75 66 66 65 |diff-pat|ch-buffe|
|00001890| 72 5d 20 28 22 54 6f 20 | 61 20 42 75 66 66 65 72 |r] ("To |a Buffer|
|000018a0| 2e 2e 2e 22 20 2e 20 65 | 64 69 66 66 2d 70 61 74 |..." . e|diff-pat|
|000018b0| 63 68 2d 62 75 66 66 65 | 72 29 20 5b 65 64 69 66 |ch-buffe|r) [edif|
|000018c0| 66 2d 70 61 74 63 68 2d | 66 69 6c 65 5d 20 28 22 |f-patch-|file] ("|
|000018d0| 54 6f 20 61 20 46 69 6c | 65 2e 2e 2e 22 20 2e 20 |To a Fil|e..." . |
|000018e0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 66 69 6c 65 |ediff-pa|tch-file|
|000018f0| 29 20 61 75 74 6f 6c 6f | 61 64 20 65 64 69 66 66 |) autolo|ad ediff|
|00001900| 20 22 65 64 69 66 66 22 | 20 22 43 6f 6d 70 61 72 | "ediff"| "Compar|
|00001910| 65 20 74 77 6f 20 66 69 | 6c 65 73 22 20 74 20 65 |e two fi|les" t e|
|00001920| 64 69 66 66 2d 66 69 6c | 65 73 20 65 64 69 66 66 |diff-fil|es ediff|
|00001930| 2d 62 75 66 66 65 72 73 | 20 22 43 6f 6d 70 61 72 |-buffers| "Compar|
|00001940| 65 20 74 77 6f 20 62 75 | 66 65 72 73 22 20 65 62 |e two bu|fers" eb|
|00001950| 75 66 66 65 72 73 20 65 | 64 69 66 66 33 20 22 43 |uffers e|diff3 "C|
|00001960| 6f 6d 70 61 72 65 20 74 | 68 72 65 65 20 66 69 6c |ompare t|hree fil|
|00001970| 65 73 22 20 65 64 69 66 | 66 2d 66 69 6c 65 73 33 |es" edif|f-files3|
|00001980| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 73 33 20 | ediff-b|uffers3 |
|00001990| 22 43 6f 6d 70 61 72 65 | 20 74 68 72 65 65 20 62 |"Compare| three b|
|000019a0| 75 66 65 72 73 22 20 65 | 62 75 66 66 65 72 73 33 |ufers" e|buffers3|
|000019b0| 20 65 64 69 66 66 2d 72 | 65 76 69 73 69 6f 6e 20 | ediff-r|evision |
|000019c0| 22 43 6f 6d 70 61 72 65 | 20 76 65 72 73 69 6f 6e |"Compare| version|
|000019d0| 73 20 6f 66 20 61 20 66 | 69 6c 65 22 20 65 64 69 |s of a f|ile" edi|
|000019e0| 66 66 2d 77 69 6e 64 6f | 77 73 2d 77 6f 72 64 77 |ff-windo|ws-wordw|
|000019f0| 69 73 65 20 22 43 6f 6d | 70 61 72 65 20 74 77 6f |ise "Com|pare two|
|00001a00| 20 77 69 6e 64 6f 77 73 | 20 77 6f 72 64 2d 62 79 | windows| word-by|
|00001a10| 2d 77 6f 72 64 2e 22 20 | 65 64 69 66 66 2d 72 65 |-word." |ediff-re|
|00001a20| 67 69 6f 6e 73 2d 77 6f | 72 64 77 69 73 65 20 22 |gions-wo|rdwise "|
|00001a30| 43 6f 6d 70 61 72 65 20 | 74 77 6f 20 72 65 67 69 |Compare |two regi|
|00001a40| 6f 6e 73 20 77 6f 72 64 | 2d 62 79 2d 77 6f 72 64 |ons word|-by-word|
|00001a50| 2e 22 20 65 64 69 66 66 | 2d 77 69 6e 64 6f 77 73 |." ediff|-windows|
|00001a60| 2d 6c 69 6e 65 77 69 73 | 65 20 22 43 6f 6d 70 61 |-linewis|e "Compa|
|00001a70| 72 65 20 74 77 6f 20 77 | 69 6e 64 6f 77 73 20 6c |re two w|indows l|
|00001a80| 69 6e 65 2d 62 79 2d 6c | 69 6e 65 2e 22 20 65 64 |ine-by-l|ine." ed|
|00001a90| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 6c 69 6e 65 |iff-regi|ons-line|
|00001aa0| 77 69 73 65 20 22 43 6f | 6d 70 61 72 65 20 74 77 |wise "Co|mpare tw|
|00001ab0| 6f 20 72 65 67 69 6f 6e | 73 20 6c 69 6e 65 2d 62 |o region|s line-b|
|00001ac0| 79 2d 6c 69 6e 65 2e 22 | 20 65 64 69 66 66 2d 70 |y-line."| ediff-p|
|00001ad0| 61 74 63 68 2d 66 69 6c | 65 20 22 50 61 74 63 68 |atch-fil|e "Patch|
|00001ae0| 20 61 20 66 69 6c 65 2e | 22 20 65 70 61 74 63 68 | a file.|" epatch|
|00001af0| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 62 75 66 | ediff-p|atch-buf|
|00001b00| 66 65 72 20 22 50 61 74 | 63 68 20 61 20 62 75 66 |fer "Pat|ch a buf|
|00001b10| 66 65 72 2e 22 20 65 70 | 61 74 63 68 2d 62 75 66 |fer." ep|atch-buf|
|00001b20| 66 65 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 20 |fer edif|f-merge |
|00001b30| 22 4d 65 72 67 65 20 74 | 77 6f 20 66 69 6c 65 73 |"Merge t|wo files|
|00001b40| 2e 22 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 66 |." ediff|-merge-f|
|00001b50| 69 6c 65 73 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |iles edi|ff-merge|
|00001b60| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|00001b70| 73 74 6f 72 20 22 4d 65 | 72 67 65 20 74 77 6f 20 |stor "Me|rge two |
|00001b80| 66 69 6c 65 73 20 75 73 | 69 6e 67 20 61 20 74 68 |files us|ing a th|
|00001b90| 69 72 64 20 66 69 6c 65 | 20 61 73 20 61 6e 20 61 |ird file| as an a|
|00001ba0| 6e 63 65 73 74 6f 72 2e | 22 20 65 64 69 66 66 2d |ncestor.|" ediff-|
|00001bb0| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 22 4d |merge-bu|ffers "M|
|00001bc0| 65 72 67 65 20 74 77 6f | 20 62 75 66 66 65 72 73 |erge two| buffers|
|00001bd0| 2e 22 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 62 |." ediff|-merge-b|
|00001be0| 75 66 66 65 72 73 2d 77 | 69 74 68 2d 61 6e 63 65 |uffers-w|ith-ance|
|00001bf0| 73 74 6f 72 20 22 4d 65 | 72 67 65 20 74 77 6f 20 |stor "Me|rge two |
|00001c00| 62 75 66 66 65 72 73 20 | 75 73 69 6e 67 20 61 20 |buffers |using a |
|00001c10| 74 68 69 72 64 20 62 75 | 66 66 65 72 20 61 73 20 |third bu|ffer as |
|00001c20| 61 6e 20 61 6e 63 65 73 | 74 6f 72 2e 22 20 65 64 |an ances|tor." ed|
|00001c30| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00001c40| 6f 6e 73 20 22 4d 65 72 | 67 65 20 74 77 6f 20 76 |ons "Mer|ge two v|
|00001c50| 65 72 73 69 6f 6e 73 20 | 6f 66 20 61 20 66 69 6c |ersions |of a fil|
|00001c60| 65 2e 22 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |e." edif|f-merge-|
|00001c70| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00001c80| 6e 63 65 73 74 6f 72 20 | 65 64 69 72 73 20 22 43 |ncestor |edirs "C|
|00001c90| 6f 6d 70 61 72 65 20 66 | 69 6c 65 73 20 69 6e 20 |ompare f|iles in |
|00001ca0| 74 77 6f 20 64 69 72 65 | 63 74 6f 72 69 65 73 2e |two dire|ctories.|
|00001cb0| 22 20 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 |" ediff-|director|
|00001cc0| 69 65 73 20 65 64 69 72 | 73 33 20 22 43 6f 6d 70 |ies edir|s3 "Comp|
|00001cd0| 61 72 65 20 66 69 6c 65 | 73 20 69 6e 20 74 68 72 |are file|s in thr|
|00001ce0| 65 65 20 64 69 72 65 63 | 74 6f 72 69 65 73 2e 22 |ee direc|tories."|
|00001cf0| 20 65 64 69 66 66 2d 64 | 69 72 65 63 74 6f 72 69 | ediff-d|irectori|
|00001d00| 65 73 33 20 65 64 69 72 | 2d 72 65 76 69 73 69 6f |es3 edir|-revisio|
|00001d10| 6e 73 20 22 43 6f 6d 70 | 61 72 65 20 74 77 6f 20 |ns "Comp|are two |
|00001d20| 76 65 72 73 69 6f 6e 73 | 20 6f 66 20 61 20 66 69 |versions| of a fi|
|00001d30| 6c 65 2e 22 20 65 64 69 | 66 66 2d 64 69 72 65 63 |le." edi|ff-direc|
|00001d40| 74 6f 72 79 2d 72 65 76 | 69 73 69 6f 6e 73 20 65 |tory-rev|isions e|
|00001d50| 64 69 72 73 2d 6d 65 72 | 67 65 20 22 4d 65 72 67 |dirs-mer|ge "Merg|
|00001d60| 65 20 66 69 6c 65 73 20 | 69 6e 20 74 77 6f 20 64 |e files |in two d|
|00001d70| 69 72 65 63 74 6f 72 69 | 65 73 2e 22 20 65 64 69 |irectori|es." edi|
|00001d80| 66 66 2d 6d 65 72 67 65 | 2d 64 69 72 65 63 74 6f |ff-merge|-directo|
|00001d90| 72 69 65 73 20 65 64 69 | 72 73 2d 6d 65 72 67 65 |ries edi|rs-merge|
|00001da0| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 22 |-with-an|cestor "|
|00001db0| 4d 65 72 67 65 20 66 69 | 6c 65 73 20 69 6e 20 74 |Merge fi|les in t|
|00001dc0| 77 6f 20 64 69 72 65 63 | 74 6f 72 69 65 73 20 75 |wo direc|tories u|
|00001dd0| 73 69 6e 67 20 66 69 6c | 65 73 20 69 6e 20 61 20 |sing fil|es in a |
|00001de0| 74 68 69 72 64 20 64 69 | 72 20 61 73 20 61 6e 63 |third di|r as anc|
|00001df0| 65 73 74 6f 72 73 2e 22 | 20 65 64 69 66 66 2d 6d |estors."| ediff-m|
|00001e00| 65 72 67 65 2d 64 69 72 | 65 63 74 6f 72 69 65 73 |erge-dir|ectories|
|00001e10| 2d 77 69 74 68 2d 61 6e | 63 65 73 74 6f 72 20 65 |-with-an|cestor e|
|00001e20| 64 69 72 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |dir-merg|e-revisi|
|00001e30| 6f 6e 73 20 22 4d 65 72 | 67 65 20 76 65 72 73 69 |ons "Mer|ge versi|
|00001e40| 6f 6e 73 20 6f 66 20 66 | 69 6c 65 73 20 69 6e 20 |ons of f|iles in |
|00001e50| 61 20 64 69 72 65 63 74 | 6f 72 79 2e 22 20 65 64 |a direct|ory." ed|
|00001e60| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00001e70| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |ory-revi|sions ed|
|00001e80| 69 66 66 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |iff-merg|e-direct|
|00001e90| 6f 72 79 2d 72 65 76 69 | 73 69 6f 6e 73 2d 77 69 |ory-revi|sions-wi|
|00001ea0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 22 4d 65 72 |th-ances|tor "Mer|
|00001eb0| 67 65 20 76 65 72 73 69 | 6f 6e 73 20 6f 66 20 66 |ge versi|ons of f|
|00001ec0| 69 6c 65 73 20 69 6e 20 | 61 20 64 69 72 65 63 74 |iles in |a direct|
|00001ed0| 6f 72 79 20 75 73 69 6e | 67 20 6f 74 68 65 72 20 |ory usin|g other |
|00001ee0| 76 65 72 73 69 6f 6e 73 | 20 61 73 20 61 6e 63 65 |versions| as ance|
|00001ef0| 73 74 6f 72 73 2e 22 20 | 65 64 69 72 2d 6d 65 72 |stors." |edir-mer|
|00001f00| 67 65 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ge-revis|ions-wit|
|00001f10| 68 2d 61 6e 63 65 73 74 | 6f 72 20 65 64 69 66 66 |h-ancest|or ediff|
|00001f20| 2d 73 68 6f 77 2d 72 65 | 67 69 73 74 72 79 20 22 |-show-re|gistry "|
|00001f30| 65 64 69 66 66 2d 6d 65 | 74 61 22 20 22 44 69 73 |ediff-me|ta" "Dis|
|00001f40| 70 6c 61 79 20 74 68 65 | 20 72 65 67 69 73 74 72 |play the| registr|
|00001f50| 79 20 6f 66 20 61 63 74 | 69 76 65 20 45 64 69 66 |y of act|ive Edif|
|00001f60| 66 20 73 65 73 73 69 6f | 6e 73 2e 22 20 65 64 69 |f sessio|ns." edi|
|00001f70| 66 66 2d 64 6f 63 75 6d | 65 6e 74 61 74 69 6f 6e |ff-docum|entation|
|00001f80| 20 22 44 69 73 70 6c 61 | 79 20 45 64 69 66 66 27 | "Displa|y Ediff'|
|00001f90| 73 20 6d 61 6e 75 61 6c | 2e 22 20 65 64 69 66 66 |s manual|." ediff|
|00001fa0| 2d 76 65 72 73 69 6f 6e | 20 22 53 68 6f 77 20 45 |-version| "Show E|
|00001fb0| 64 69 66 66 27 73 20 76 | 65 72 73 69 6f 6e 20 61 |diff's v|ersion a|
|00001fc0| 6e 64 20 6c 61 73 74 20 | 6d 6f 64 69 66 69 63 61 |nd last |modifica|
|00001fd0| 74 69 6f 6e 20 64 61 74 | 65 2e 22 20 70 72 6f 76 |tion dat|e." prov|
|00001fe0| 69 64 65 20 65 64 69 66 | 66 2d 68 6f 6f 6b 5d 20 |ide edif|f-hook] |
|00001ff0| 35 29 0a | |5). | |
+--------+-------------------------+-------------------------+--------+--------+
